Merge git://git.denx.de/u-boot-sunxi
authorTom Rini <[email protected]>
Fri, 10 Nov 2017 15:04:21 +0000 (10:04 -0500)
committerTom Rini <[email protected]>
Fri, 10 Nov 2017 15:04:21 +0000 (10:04 -0500)

Trivial merge